Autogenerated HTML docs for v1.5.6-rc2-15-g457bb
diff --git a/git-diff-files.txt b/git-diff-files.txt index ed9bd75..8a64869 100644 --- a/git-diff-files.txt +++ b/git-diff-files.txt
@@ -30,7 +30,8 @@ cleanly resolved paths. The option -0 can be given to omit diff output for unmerged entries and just show "Unmerged". --c,--cc:: +-c:: +--cc:: This compares stage 2 (our branch), stage 3 (their branch) and the working tree file and outputs a combined diff, similar to the way 'diff-tree' shows a merge
